fix bugs and tweak features for the unit group selection