add enable flag to switch, and put getOperable back the way it was.  Cleanups to allow easier access to grouped results