combined both search bars into one
merge fix