Improve SwitchButton sensor