PIM-1285 : revert previous query update