fix search, whew