OEC-42 Correct query implementation