fixed search issue