Ensuring correct rendering of request vs response instances for Query protocol