bugfixes on button selectors