diff --git a/src/main.sh b/src/main.sh
index 3477f83..5d24649 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -396,7 +396,19 @@ fi
 
 if [ "${1:-}" = "--help" ]; then
   cat <<EOF
-Usage: $0 [ --help | --artist <mbid> | --releasegroup <mbid> | --release <mbid> ]
+Usage: $0 [OPTION]
+
+OPTIONS:
+  --help                        Show this help and exit.
+  --artist <mbid>               List releasegroups of given artist <mbid>
+  --releasegroup <mbid>         List releases in given release group <mbid>
+  --release <mbid>              Show release given by <mbid>
+  --search-artist [<query>]     Search artist
+  --search-album [<query>]      Search album
+  --ni-search-artist [<query>]  Non-interactive search
+  --ni-search-album [<query>]   Non-interactive search
+  --decorate <path>             Decorate directory containing a tagged release
+  --load-local                  Populate database with local music
 EOF
   exit 0
 fi
@@ -412,18 +424,18 @@ PIDFILE="$tmpdir/pid"
 trap 'rm -rf "$tmpdir"' EXIT INT
 export LOCKFILE RESULTS PIDFILE
 
-if [ "${1:-}" = "--search-artist" ]; then
+if [ "${1:-}" = "--ni-search-artist" ]; then
   $0 --internal-search "artist" "$2"
   exit 0
 fi
 
-if [ "${1:-}" = "--search-album" ]; then
+if [ "${1:-}" = "--ni-search-album" ]; then
   $0 --internal-search "releasegroup" "$2"
   exit 0
 fi
 
 case "${1:-}" in
-"" | "--artist" | "--releasegroup" | "--release") ;;
+"" | "--artist" | "--releasegroup" | "--release" | "--search-artist" | "--search-album") ;;
 *)
   err "Unknown option $1"
   exit 1
@@ -552,7 +564,7 @@ while true; do
     )
     [ "$sel" ] && set -- "--artist" "$sel"
     ;;
-  "--search-releasegroup")
+  "--search-album")
     sel=$(
       printf "" |
         $FZF \
@@ -569,6 +581,7 @@ while true; do
           --accept-nth="{2}" \
           --with-nth="{1}" \
           --expect="ctrl-c,ctrl-q,tab" \
+          --bind="start:transform:[ \"${2:-}\" ] && echo \"change-query:${2:-}\"" \
           --bind="load:unbind(enter)+transform:[ \"\$FZF_TOTAL_COUNT\" -gt 0 ] && echo \"rebind:ctrl-l\" || echo \"unbind:ctrl-l\"" \
           --bind="ctrl-l:accept" \
           --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" \
@@ -583,7 +596,7 @@ while true; do
     [ "$key" = "tab" ] && set -- "--search-artist"
     [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--releasegroup" "$mid"
     ;;
-  *)
+  "--search-artist")
     sel=$(
       printf "" |
         $FZF \
@@ -602,6 +615,7 @@ while true; do
           --preview-window="right,25%,border-left,wrap,<30(hidden)" \
           --preview="$0 --internal-preview-artist {2}" \
           --expect="ctrl-c,ctrl-q,tab" \
+          --bind="start:transform:[ \"${2:-}\" ] && echo \"change-query:${2:-}\"" \
           --bind="load:unbind(enter)+transform:[ \"\$FZF_TOTAL_COUNT\" -gt 0 ] && echo \"rebind:ctrl-l\" || echo \"unbind:ctrl-l\"" \
           --bind="ctrl-l:accept" \
           --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" \
@@ -614,8 +628,11 @@ while true; do
     mid=$(echo "$sel" | head -2 | tail -1)
     [ "$key" = "ctrl-c" ] && tput rmcup && exit 0
     [ "$key" = "ctrl-q" ] && tput rmcup && exit 0
-    [ "$key" = "tab" ] && set -- "--search-releasegroup"
+    [ "$key" = "tab" ] && set -- "--search-album"
     [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--artist" "$mid"
     ;;
+  *)
+    set -- "--search-artist"
+    ;;
   esac
 done