Amend singleChoiceItems where it is not a permanent/visible choice

Author: sethyx