diff --git a/todo.sh b/todo.sh
index e291d72..8dfa206 100755
--- a/todo.sh
+++ b/todo.sh
@@ -726,11 +726,11 @@ case $action in
     ;;
 
 "listcon" | "lsc" )
-    grep -w -o '@[^ ]\+' "$TODO_FILE" | sort -u
+    grep -o '[^ ]*@[^ ]\+' "$TODO_FILE" | grep '^@' | sort -u
     cleanup ;;
 
 "listproj" | "lsprj" )
-    grep -w -o '+[^ ]\+' "$TODO_FILE" | sort -u
+    grep -o '[^ ]*+[^ ]\+' "$TODO_FILE" | grep '^+' | sort -u
     cleanup ;;