fixed search problem