fixes #6168 - subscription list should require org, BZ 1097647

Reordered some routes and set the org's param `:required => false` to `:required => true`.