Fix #1990 by removing typeahead and using new search query formats

Fixes #1990