Fixed up the search bar, caught a few merge errors