Fixed helper for search