Search improvements

All tests pass and all views work as expected