Fixed searching with new searchbar