JC-1335 selectors of buttons with id duplication chagned