diff --git a/.config/zsh/functions/urlhandler b/.config/zsh/functions/urlhandler
index d8d0190..abf9c10 100755
--- a/.config/zsh/functions/urlhandler
+++ b/.config/zsh/functions/urlhandler
@@ -35,7 +35,7 @@ local selected_cmd=${default_cmd}
 for regex cmds in ${(kv)assignments}; do
     if [[ ${urls[1]} -pcre-match ${regex} ]]; then
         for cmd in ${(s/;/)cmds}; do
-            if type ${cmd} >& -; then
+            if type ${cmd%% *} >& -; then
                 selected_cmd=${cmd}
                 break
             fi
@@ -44,4 +44,4 @@ for regex cmds in ${(kv)assignments}; do
     fi
 done
 
-${selected_cmd} ${urls}
+eval ${selected_cmd} ${urls}