Toggle restriction with action choice

Closes #1290