Feature/search fixes

Fix up the search bar (both form and function).