[#523|refactor] reduce conditionals in feature toggles
[#523|refactor] reduce conditionals in feature toggles

advocacycommons/advocacycommons,advocacycommons/advocacycommons,advocacycommons/advocacycommons