Fixed issue with regards to typeahead