Change number type of group orger (int -> long) + optimization