SUMO-12582 Minor query alternative