Update group count label and fix sorting