fixed search 2.0