bug fix and group tree leaf changed to expandable