added dedicated class for autocomplete and search