Hotfix for ES search