Re-arranging where remote queries are processed.