PLA-1272 query change