Fix typeahead matcher so it works with spaces

Moved the workaround to the private method so it doesn't mess with the settable matcher callback.