add listener context to the submitting query, add query id to the result set