changed query and autocomplete templates