Adapt ES queries to current index structure

See EDOZWO-351