Make groupements by heb type (#4864)