Search should work every time now