Changes for search form and Ort autocomplete