ExpanderView, bug fixes