fix for search issue