Hotfix for search