Added search and autocomplete