GPII-222: Changed the name of the label selector to be more consistent with established pattern. Fixed naming of toggle selector.