Issue 18023 - update batchparam query if MQL updated