Switchover querying to ES, needs more work