Fix bug with restricted data not being updated on variable change.
Keep restricted variable controls state.