adding changes to typeahead and tooltip