NBIA-797 Fix Replacing "Submit" with "Save Query"