NXP-12127: speed-up query