Implemented search fallback