diff --git a/docs/block.md b/docs/block.md
index 530c6a9..0172bfc 100644
--- a/docs/block.md
+++ b/docs/block.md
@@ -3,64 +3,12 @@
 
 Append block children
 
-* [`notion-cli block a BLOCK_ID CHILDREN [AFTER]`](#notion-cli-block-a-block_id-children-after)
 * [`notion-cli block append BLOCK_ID CHILDREN [AFTER]`](#notion-cli-block-append-block_id-children-after)
-* [`notion-cli block d BLOCK_ID`](#notion-cli-block-d-block_id)
 * [`notion-cli block delete BLOCK_ID`](#notion-cli-block-delete-block_id)
-* [`notion-cli block r BLOCK_ID`](#notion-cli-block-r-block_id)
-* [`notion-cli block r c BLOCK_ID`](#notion-cli-block-r-c-block_id)
 * [`notion-cli block retrieve BLOCK_ID`](#notion-cli-block-retrieve-block_id)
 * [`notion-cli block retrieve children BLOCK_ID`](#notion-cli-block-retrieve-children-block_id)
-* [`notion-cli block u BLOCK_ID`](#notion-cli-block-u-block_id)
 * [`notion-cli block update BLOCK_ID`](#notion-cli-block-update-block_id)
 
-## `notion-cli block a BLOCK_ID CHILDREN [AFTER]`
-
-Append block children
-
-```
-USAGE
-  $ notion-cli block a BLOCK_ID CHILDREN [AFTER] [-r] [--columns <value> | -x] [--sort <value>] [--filter
-    <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Append block children
-
-ALIASES
-  $ notion-cli block a
-
-EXAMPLES
-  Append block children
-
-    $ notion-cli block append BLOCK_ID -c \
-      '[{"object":"block","type":"paragraph","paragraph":{"text":[{"type":"text","text":{"content":"Hello \
-      world!"}}]}}]'
-
-  Append block children after a block
-
-    $ notion-cli block append BLOCK_ID -c \
-      '[{"object":"block","type":"paragraph","paragraph":{"text":[{"type":"text","text":{"content":"Hello \
-      world!"}}]}}]' -a BLOCK_ID
-
-  Append block children and output raw json
-
-    $ notion-cli block append BLOCK_ID -c \
-      '[{"object":"block","type":"paragraph","paragraph":{"text":[{"type":"text","text":{"content":"Hello \
-      world!"}}]}}]' -r
-```
-
 ## `notion-cli block append BLOCK_ID CHILDREN [AFTER]`
 
 Append block children
@@ -110,43 +58,6 @@ EXAMPLES
 
 
 
-## `notion-cli block d BLOCK_ID`
-
-Delete a block
-
-```
-USAGE
-  $ notion-cli block d BLOCK_ID [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output
-    csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Delete a block
-
-ALIASES
-  $ notion-cli block d
-
-EXAMPLES
-  Delete a block
-
-    $ notion-cli block delete BLOCK_ID
-
-  Delete a block and output raw json
-
-    $ notion-cli block delete BLOCK_ID -r
-```
-
 ## `notion-cli block delete BLOCK_ID`
 
 Delete a block
@@ -186,83 +97,6 @@ EXAMPLES
 
 
 
-## `notion-cli block r BLOCK_ID`
-
-Retrieve a block
-
-```
-USAGE
-  $ notion-cli block r BLOCK_ID [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output
-    csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Retrieve a block
-
-ALIASES
-  $ notion-cli block r
-
-EXAMPLES
-  Retrieve a block
-
-    $ notion-cli block retrieve BLOCK_ID
-
-  Retrieve a block and output raw json
-
-    $ notion-cli block retrieve BLOCK_ID -r
-```
-
-## `notion-cli block r c BLOCK_ID`
-
-Retrieve block children
-
-```
-USAGE
-  $ notion-cli block r c BLOCK_ID [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output
-    csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-ARGUMENTS
-  BLOCK_ID  block_id or page_id
-
-FLAGS
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Retrieve block children
-
-ALIASES
-  $ notion-cli block r c
-
-EXAMPLES
-  Retrieve block children
-
-    $ notion-cli block retrieve:children BLOCK_ID
-
-  Retrieve block children and output raw json
-
-    $ notion-cli block retrieve:children BLOCK_ID -r
-```
-
 ## `notion-cli block retrieve BLOCK_ID`
 
 Retrieve a block
@@ -344,44 +178,6 @@ EXAMPLES
 
 
 
-## `notion-cli block u BLOCK_ID`
-
-Update a block
-
-```
-USAGE
-  $ notion-cli block u BLOCK_ID [-a] [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>]
-    [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -a, --archived
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Update a block
-
-ALIASES
-  $ notion-cli block u
-
-EXAMPLES
-  Update a block and output table
-
-    $ notion-cli block update BLOCK_ID
-
-  Update a block and output raw json
-
-    $ notion-cli block update BLOCK_ID -r
-```
-
 ## `notion-cli block update BLOCK_ID`
 
 Update a block
diff --git a/docs/db.md b/docs/db.md
index eafdd13..e5c1c47 100644
--- a/docs/db.md
+++ b/docs/db.md
@@ -3,65 +3,11 @@
 
 Create a database
 
-* [`notion-cli db c PAGE_ID`](#notion-cli-db-c-page_id)
 * [`notion-cli db create PAGE_ID`](#notion-cli-db-create-page_id)
-* [`notion-cli db q [DATABASE_ID]`](#notion-cli-db-q-database_id)
 * [`notion-cli db query [DATABASE_ID]`](#notion-cli-db-query-database_id)
-* [`notion-cli db r [DATABASE_ID]`](#notion-cli-db-r-database_id)
 * [`notion-cli db retrieve [DATABASE_ID]`](#notion-cli-db-retrieve-database_id)
-* [`notion-cli db u [DATABASE_ID]`](#notion-cli-db-u-database_id)
 * [`notion-cli db update [DATABASE_ID]`](#notion-cli-db-update-database_id)
 
-## `notion-cli db c PAGE_ID`
-
-Create a database
-
-```
-USAGE
-  $ notion-cli db c PAGE_ID [-t <value>] [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>]
-    [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw            output raw json
-  -t, --title=<value>  new database title
-  -x, --extended       show extra columns
-  --columns=<value>    only show provided columns (comma-separated)
-  --csv                output is csv format [alias: --output=csv]
-  --filter=<value>     filter property by partial string matching, ex: name=foo
-  --no-header          hide table header from output
-  --no-truncate        do not truncate output to fit screen
-  --output=<option>    output in a more machine friendly format
-                       <options: csv|json|yaml>
-  --sort=<value>       property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Create a database
-
-ALIASES
-  $ notion-cli db c
-
-EXAMPLES
-  Create a database via interactive mode
-
-    $ notion-cli db create
-
-  Create a database with a specific page_id
-
-    $ notion-cli db create PAGE_ID
-
-  Create a database with a specific page_id and title
-
-    $ notion-cli db create PAGE_ID -t 'My Database'
-
-  Create a database with a specific page_id and output raw json
-
-    $ notion-cli db create PAGE_ID -r
-
-  Create a database with a specific page_id and output raw json with title
-
-    $ notion-cli db create PAGE_ID -t 'My Database' -r
-```
-
 ## `notion-cli db create PAGE_ID`
 
 Create a database
@@ -114,57 +60,6 @@ EXAMPLES
 
 
 
-## `notion-cli db q [DATABASE_ID]`
-
-Query a database
-
-```
-USAGE
-  $ notion-cli db q [DATABASE_ID] [-a <value>] [-f <value>] [-r] [--columns <value> | -x] [--sort <value>]
-    [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -a, --rawFilter=<value>   JSON stringified filter string
-  -f, --fileFilter=<value>  JSON filter file path
-  -r, --raw                 output raw json
-  -x, --extended            show extra columns
-  --columns=<value>         only show provided columns (comma-separated)
-  --csv                     output is csv format [alias: --output=csv]
-  --filter=<value>          filter property by partial string matching, ex: name=foo
-  --no-header               hide table header from output
-  --no-truncate             do not truncate output to fit screen
-  --output=<option>         output in a more machine friendly format
-                            <options: csv|json|yaml>
-  --sort=<value>            property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Query a database
-
-ALIASES
-  $ notion-cli db q
-
-EXAMPLES
-  Query a db via interactive mode
-
-    $ notion-cli db query
-
-  Query a db via interactive mode with a specific database_id
-
-    $ notion-cli db query DATABASE_ID
-
-  Query a db with a specific database_id and raw filter string
-
-    $ notion-cli db query -r='{"and": ...}' DATABASE_ID
-
-  Query a db with a specific database_id and filter file
-
-    $ notion-cli db query -f ./path/to/filter.json DATABASE_ID
-
-  Query a db with a specific database_id and output format
-
-    $ notion-cli db query --csv DATABASE_ID
-```
-
 ## `notion-cli db query [DATABASE_ID]`
 
 Query a database
@@ -205,7 +100,7 @@ EXAMPLES
 
   Query a db with a specific database_id and raw filter string
 
-    $ notion-cli db query -r='{"and": ...}' DATABASE_ID
+    $ notion-cli db query -a='{"and": ...}' DATABASE_ID
 
   Query a db with a specific database_id and filter file
 
@@ -218,43 +113,6 @@ EXAMPLES
 
 
 
-## `notion-cli db r [DATABASE_ID]`
-
-Retrieve a database
-
-```
-USAGE
-  $ notion-cli db r [DATABASE_ID] [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>]
-    [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Retrieve a database
-
-ALIASES
-  $ notion-cli db r
-
-EXAMPLES
-  Retrieve a database via interactive mode
-
-    $ notion-cli db retrieve
-
-  Retrieve a database via database_id
-
-    $ notion-cli db retrieve DATABSE_ID
-```
-
 ## `notion-cli db retrieve [DATABASE_ID]`
 
 Retrieve a database
@@ -294,52 +152,6 @@ EXAMPLES
 
 
 
-## `notion-cli db u [DATABASE_ID]`
-
-Update a database
-
-```
-USAGE
-  $ notion-cli db u [DATABASE_ID] [-t <value>] [-r] [--columns <value> | -x] [--sort <value>] [--filter
-    <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw            output raw json
-  -t, --title=<value>  New database title
-  -x, --extended       show extra columns
-  --columns=<value>    only show provided columns (comma-separated)
-  --csv                output is csv format [alias: --output=csv]
-  --filter=<value>     filter property by partial string matching, ex: name=foo
-  --no-header          hide table header from output
-  --no-truncate        do not truncate output to fit screen
-  --output=<option>    output in a more machine friendly format
-                       <options: csv|json|yaml>
-  --sort=<value>       property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Update a database
-
-ALIASES
-  $ notion-cli db u
-
-EXAMPLES
-  Update a database via interactive mode
-
-    $ notion-cli db update
-
-  Update a database with a specific database_id
-
-    $ notion-cli db update DATABASE_ID
-
-  Update a database with a specific database_id and title
-
-    $ notion-cli db update DATABASE_ID -t 'My Database'
-
-  Update a database with a specific database_id and output raw json
-
-    $ notion-cli db update DATABASE_ID -r
-```
-
 ## `notion-cli db update [DATABASE_ID]`
 
 Update a database
diff --git a/docs/page.md b/docs/page.md
index 0a85a03..e4af2c5 100644
--- a/docs/page.md
+++ b/docs/page.md
@@ -3,71 +3,11 @@
 
 Create a page
 
-* [`notion-cli page c`](#notion-cli-page-c)
 * [`notion-cli page create`](#notion-cli-page-create)
-* [`notion-cli page r PAGE_ID`](#notion-cli-page-r-page_id)
-* [`notion-cli page r pi PAGE_ID PROPERTY_ID`](#notion-cli-page-r-pi-page_id-property_id)
 * [`notion-cli page retrieve PAGE_ID`](#notion-cli-page-retrieve-page_id)
 * [`notion-cli page retrieve property_item PAGE_ID PROPERTY_ID`](#notion-cli-page-retrieve-property_item-page_id-property_id)
-* [`notion-cli page u PAGE_ID`](#notion-cli-page-u-page_id)
 * [`notion-cli page update PAGE_ID`](#notion-cli-page-update-page_id)
 
-## `notion-cli page c`
-
-Create a page
-
-```
-USAGE
-  $ notion-cli page c [-p <value>] [-d <value>] [-f <value>] [-r] [--columns <value> | -x] [--sort <value>]
-    [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -d, --parent_db_id=<value>
-  -f, --file_path=<value>       Path to a source markdown file
-  -p, --parent_page_id=<value>
-  -r, --raw                     output raw json
-  -x, --extended                show extra columns
-  --columns=<value>             only show provided columns (comma-separated)
-  --csv                         output is csv format [alias: --output=csv]
-  --filter=<value>              filter property by partial string matching, ex: name=foo
-  --no-header                   hide table header from output
-  --no-truncate                 do not truncate output to fit screen
-  --output=<option>             output in a more machine friendly format
-                                <options: csv|json|yaml>
-  --sort=<value>                property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Create a page
-
-ALIASES
-  $ notion-cli page c
-
-EXAMPLES
-  Create a page via interactive mode
-
-    $ notion-cli page create
-
-  Create a page with a specific parent_page_id
-
-    $ notion-cli page create -p PARENT_PAGE_ID
-
-  Create a page with a specific parent_db_id
-
-    $ notion-cli page create -d PARENT_DB_ID
-
-  Create a page with a specific source markdown file and parent_page_id
-
-    $ notion-cli page create -f ./path/to/source.md -p PARENT_PAGE_ID
-
-  Create a page with a specific source markdown file and parent_db_id
-
-    $ notion-cli page create -f ./path/to/source.md -d PARENT_DB_ID
-
-  Create a page with a specific source markdown file and output raw json with parent_page_id
-
-    $ notion-cli page create -f ./path/to/source.md -p PARENT_PAGE_ID -r
-```
-
 ## `notion-cli page create`
 
 Create a page
@@ -126,81 +66,6 @@ EXAMPLES
 
 
 
-## `notion-cli page r PAGE_ID`
-
-Retrieve a page
-
-```
-USAGE
-  $ notion-cli page r PAGE_ID [-p <value>] [-r] [-m] [--columns <value> | -x] [--sort <value>] [--filter
-    <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -m, --markdown                   output markdown
-  -p, --filter_properties=<value>  Comma separated property id string
-  -r, --raw                        output raw json
-  -x, --extended                   show extra columns
-  --columns=<value>                only show provided columns (comma-separated)
-  --csv                            output is csv format [alias: --output=csv]
-  --filter=<value>                 filter property by partial string matching, ex: name=foo
-  --no-header                      hide table header from output
-  --no-truncate                    do not truncate output to fit screen
-  --output=<option>                output in a more machine friendly format
-                                   <options: csv|json|yaml>
-  --sort=<value>                   property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Retrieve a page
-
-ALIASES
-  $ notion-cli page r
-
-EXAMPLES
-  Retrieve a page and output table
-
-    $ notion-cli page retrieve PAGE_ID
-
-  Retrieve a page and output raw json
-
-    $ notion-cli page retrieve PAGE_ID -r
-
-  Retrieve a page and output markdown
-
-    $ notion-cli page retrieve PAGE_ID -m
-
-  Retrieve a page with filter properties
-
-    $ notion-cli page retrieve PAGE_ID -p title,Z%3ESr
-
-  Retrieve a page with filter properties and output raw json
-
-    $ notion-cli page retrieve PAGE_ID -p title,Z%3ESr -r
-```
-
-## `notion-cli page r pi PAGE_ID PROPERTY_ID`
-
-Retrieve a page property item
-
-```
-USAGE
-  $ notion-cli page r pi PAGE_ID PROPERTY_ID
-
-DESCRIPTION
-  Retrieve a page property item
-
-ALIASES
-  $ notion-cli page r pi
-
-EXAMPLES
-  Retrieve a page property item
-
-    $ notion-cli page retrieve:property_item PAGE_ID PROPERTY_ID
-
-  Retrieve a page property item and output raw json
-
-    $ notion-cli page retrieve:property_item PAGE_ID PROPERTY_ID -r
-```
-
 ## `notion-cli page retrieve PAGE_ID`
 
 Retrieve a page
@@ -280,61 +145,6 @@ EXAMPLES
 
 
 
-## `notion-cli page u PAGE_ID`
-
-Update a page
-
-```
-USAGE
-  $ notion-cli page u PAGE_ID [-a] [-u] [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>]
-    [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -a, --archived
-  -r, --raw          output raw json
-  -u, --un_archive
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Update a page
-
-ALIASES
-  $ notion-cli page u
-
-EXAMPLES
-  Update a page and output table
-
-    $ notion-cli page update PAGE_ID
-
-  Update a page and output raw json
-
-    $ notion-cli page update PAGE_ID -r
-
-  Update a page and archive
-
-    $ notion-cli page update PAGE_ID -a
-
-  Update a page and un archive
-
-    $ notion-cli page update PAGE_ID -u
-
-  Update a page and archive and output raw json
-
-    $ notion-cli page update PAGE_ID -a -r
-
-  Update a page and un archive and output raw json
-
-    $ notion-cli page update PAGE_ID -u -r
-```
-
 ## `notion-cli page update PAGE_ID`
 
 Update a page
diff --git a/docs/user.md b/docs/user.md
index c9846f1..cb2b639 100644
--- a/docs/user.md
+++ b/docs/user.md
@@ -3,50 +3,10 @@
 
 List all users
 
-* [`notion-cli user l`](#notion-cli-user-l)
 * [`notion-cli user list`](#notion-cli-user-list)
-* [`notion-cli user r [USER_ID]`](#notion-cli-user-r-user_id)
-* [`notion-cli user r b`](#notion-cli-user-r-b)
 * [`notion-cli user retrieve [USER_ID]`](#notion-cli-user-retrieve-user_id)
 * [`notion-cli user retrieve bot`](#notion-cli-user-retrieve-bot)
 
-## `notion-cli user l`
-
-List all users
-
-```
-USAGE
-  $ notion-cli user l [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output
-    csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  List all users
-
-ALIASES
-  $ notion-cli user l
-
-EXAMPLES
-  List all users
-
-    $ notion-cli user list
-
-  List all users and output raw json
-
-    $ notion-cli user list -r
-```
-
 ## `notion-cli user list`
 
 List all users
@@ -86,80 +46,6 @@ EXAMPLES
 
 
 
-## `notion-cli user r [USER_ID]`
-
-Retrieve a user
-
-```
-USAGE
-  $ notion-cli user r [USER_ID] [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output
-    csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Retrieve a user
-
-ALIASES
-  $ notion-cli user r
-
-EXAMPLES
-  Retrieve a user
-
-    $ notion-cli user retrieve USER_ID
-
-  Retrieve a user and output raw json
-
-    $ notion-cli user retrieve USER_ID -r
-```
-
-## `notion-cli user r b`
-
-Retrieve a bot user
-
-```
-USAGE
-  $ notion-cli user r b [-r] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output
-    csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
-
-FLAGS
-  -r, --raw          output raw json
-  -x, --extended     show extra columns
-  --columns=<value>  only show provided columns (comma-separated)
-  --csv              output is csv format [alias: --output=csv]
-  --filter=<value>   filter property by partial string matching, ex: name=foo
-  --no-header        hide table header from output
-  --no-truncate      do not truncate output to fit screen
-  --output=<option>  output in a more machine friendly format
-                     <options: csv|json|yaml>
-  --sort=<value>     property to sort by (prepend '-' for descending)
-
-DESCRIPTION
-  Retrieve a bot user
-
-ALIASES
-  $ notion-cli user r b
-
-EXAMPLES
-  Retrieve a bot user
-
-    $ notion-cli user retrieve:bot
-
-  Retrieve a bot user and output raw json
-
-    $ notion-cli user retrieve:bot -r
-```
-
 ## `notion-cli user retrieve [USER_ID]`
 
 Retrieve a user
diff --git a/package.json b/package.json
index 035ab60..86cbae5 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "postpack": "shx rm -f oclif.manifest.json",
     "prepack": "yarn build && oclif manifest && yarn readme",
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
-    "readme": "oclif readme --multi && shx sed -i \"s/^_See code:.*$//g\" docs/*.md > /dev/null"
+    "readme": "oclif readme --multi --no-aliases && shx sed -i \"s/^_See code:.*$//g\" docs/*.md > /dev/null"
   },
   "engines": {
     "node": ">=12.0.0"
diff --git a/src/commands/db/query.ts b/src/commands/db/query.ts
index 8053140..0c30eaf 100644
--- a/src/commands/db/query.ts
+++ b/src/commands/db/query.ts
@@ -37,7 +37,7 @@ export default class DbQuery extends Command {
     },
     {
       description: 'Query a db with a specific database_id and raw filter string',
-      command: `$ notion-cli db query -r='{"and": ...}' DATABASE_ID`,
+      command: `$ notion-cli db query -a='{"and": ...}' DATABASE_ID`,
     },
     {
       description: 'Query a db with a specific database_id and filter file',