right rate grouping for vat refactor