[OEM-230] fixed double query