issue #293 - improvements to items switched on/off.