Repack the query response only if there is a response.