diff --git a/src/main.sh b/src/main.sh
index 7f58b7c..3477f83 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -412,11 +412,24 @@ PIDFILE="$tmpdir/pid"
 trap 'rm -rf "$tmpdir"' EXIT INT
 export LOCKFILE RESULTS PIDFILE
 
-if [ "${1:-}" = "--search" ]; then
-  $0 --internal-search "$2" "$3"
+if [ "${1:-}" = "--search-artist" ]; then
+  $0 --internal-search "artist" "$2"
   exit 0
 fi
 
+if [ "${1:-}" = "--search-album" ]; then
+  $0 --internal-search "releasegroup" "$2"
+  exit 0
+fi
+
+case "${1:-}" in
+"" | "--artist" | "--releasegroup" | "--release") ;;
+*)
+  err "Unknown option $1"
+  exit 1
+  ;;
+esac
+
 while true; do
   case "${1:-}" in
   "--artist")
@@ -450,6 +463,7 @@ while true; do
     [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_releasegroup "$mid" | $JQ -r '."artist-credit"')"
     ;;
   "--releasegroup")
+    set -x
     title="$(mb_releasegroup "$2" |
       $JQ -r '.title')"
     artist="$(mb_releasegroup "$2" |