DDF-802 Fixed selectors for button groups when clearing