Fixed up some search, though it is still bad