Honor :single_org => 'orgname' parameter everywhere