revising app and group by cabang