Fixes bug 1114552 - Added Query service to es module.

@phrawzty r?
Why not `WaterOtter`? :laughing: 

Sorry, I'm a little tipsy.