diff --git a/cli/src/main/groovy/com/jdbernard/wdiwtlt/cli/CommandLineInterface.groovy b/cli/src/main/groovy/com/jdbernard/wdiwtlt/cli/CommandLineInterface.groovy
index 8efcc85..8101cf5 100644
--- a/cli/src/main/groovy/com/jdbernard/wdiwtlt/cli/CommandLineInterface.groovy
+++ b/cli/src/main/groovy/com/jdbernard/wdiwtlt/cli/CommandLineInterface.groovy
@@ -423,7 +423,7 @@ Configuration:
             return selection.collectMany { library.getWhere(modelClass,
                     [(idKeyFor(selectionClass)): it.id]) }.findAll()
 
-        case ~/files tagged( as){0,1}((\s\w+)+)/:
+        case ~/files tagged( as){0,1}((\s[^\s]+)+)/:
             selectedTags = Matcher.lastMatcher[0][2].split(/\s/)
                 .collect { it?.trim() }.findAll()
                 .collect { library.getTagByName(it) }.findAll()
@@ -1337,6 +1337,7 @@ Library Management:
                 status.text = s }
             else status.text = "${currentSelection.size()} " +
             "${toEnglish(currentSelection[0].class)}s selected." }
+        else status.text = ""
         return status.text }
 
 }