Hacking ES in
Make ES queries work
Fix last rebase
Fix my fix