Rejig of discussion switches
Merge pull request #3652 from guardian/discussion-switches-in-right-places

Rejig of discussion switches