refactor typeahead, allow friendly X in Y geo queries