Let Level 20 an 21 depend on enable-remote-toggle instead of FEATURE_TOGGLE