Use RP work-around for all queries (not just commands)

Follow-up to: a33b990e49ce3c1d7e42bedce42d0d6fd147a973