group sort bugfix
cleanup