Fix for search breaking autocomplete