Hotfix for search regression