Fix search and limit search results to reasonable size