adjusted for search issue