Fix for #6151 - Filter breaks on non-alpha characters

Fix for #6151 - Match patterns now look for any non-whitespace character after the separator.