Remove customisation of typeahead, create own workaround