Fix failing tests when a query was added to the original request