Added save the queries