fixed search method