Hacking ES in
Make ES queries work