fixed search issue 1