Updated checkbox/radio for enclosed Container - code edits

Updated ```isEnclosed``` to ```hasContainer``` - since there is an enclosed label somewhere (not to confuse). Also added unsetting of this variable in the ```options``` array after reading the value.