diff --git a/share/completions/iptables.fish b/share/completions/iptables.fish
index c28f184c8..e447b0feb 100644
--- a/share/completions/iptables.fish
+++ b/share/completions/iptables.fish
@@ -29,7 +29,7 @@ function __fish_iptables_user_chains
         set tablearg "--table=$table"
     end
     # This only works as root, so ignore errors
-    iptables $tablearg -L 2>/dev/null | grep Chain | while read a b c
+    iptables $tablearg -L 2>/dev/null | string match '*Chain*' | while read a b c
         echo $b
     end
 end
diff --git a/share/completions/svn.fish b/share/completions/svn.fish
index a62b87b74..6590ac876 100644
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@@ -296,12 +296,12 @@ _svn_cmpl_ svn:keywords -a "Id" -d 'A compressed summary of all keywords'
 #
 # Completions for the 'relocate' subcommand
 #
-_svn_cmpl_ $relocate -xa '( svn info | grep URL: | cut -d " " -f 2 ) http:// ftp:// svn+ssh:// svn+ssh://(__fish_print_hostnames)'
+_svn_cmpl_ $relocate -xa '( svn info | string match "*URL:*" | cut -d " " -f 2 ) http:// ftp:// svn+ssh:// svn+ssh://(__fish_print_hostnames)'
 
 #
 # Completions for the 'switch', 'sw' subcommands
 #
-_svn_cmpl_ $switch -l relocate -d 'Relocate via URL-rewriting' -xa '( svn info | grep URL: | cut -d " " -f 2 ) http:// ftp:// svn+ssh:// svn+ssh://(__fish_print_hostnames)'
+_svn_cmpl_ $switch -l relocate -d 'Relocate via URL-rewriting' -xa '( svn info | string match "*URL:*" | cut -d " " -f 2 ) http:// ftp:// svn+ssh:// svn+ssh://(__fish_print_hostnames)'
 
 #
 # Completions for the 'status', 'st' subcommands
diff --git a/share/completions/wicd-cli.fish b/share/completions/wicd-cli.fish
index 4bb90e9f2..78008fd0f 100644
--- a/share/completions/wicd-cli.fish
+++ b/share/completions/wicd-cli.fish
@@ -9,9 +9,7 @@ complete -c wicd-cli -s y -l wireless        -d 'Perform operation on wireless n
 complete -c wicd-cli -s z -l wired           -d 'Perform operation on wired network'
 complete -c wicd-cli -s w -l save            -d 'Save profile'
 complete -c wicd-cli -s o -l load-profile    -d 'Load profile'
-complete -c wicd-cli -s m -l name            -d 'Set name for profile to save/load' #-xa '(wicd-cli -zl | sed "/^#/d; s/\S\+\s\+\(\S\+\)/\1/")'
-#complete -c wicd-cli -n '__fish_contains_opt wireless -s y' -s n -l network -xa '(wicd-cli -ySl | sed "/^#/d; s/\(\S\+\)\s\+\S\+\s\+\(\S\+\)\s\+\(.\+\)/\1\t\3, \2/")'
-#complete -c wicd-cli -n '__fish_contains_opt wired -s z' -s n -l network -xa '(wicd-cli -zl | grep -v "^#")'
+complete -c wicd-cli -s m -l name            -d 'Set name for profile to save/load'
 complete -c wicd-cli -s p -l network-property -r -d 'Get or set network property'
 complete -c wicd-cli -s s -l set-to -r -d 'Set network property to'
 complete -c wicd-cli -s n -l network -d 'Set the network'