Adding fix & test of: using the query id if id is not sent in the result.