Finished two-step query mediation