Added save query capability.