actually fixed search this time