fix search issue