[OE-3260] optimised query