On demand control in main list depends on restrict dangerous

Refs #1615
2.0.15 beta
merge