FIX: Use the old style grouping if the default grouping is altered
Merge pull request #1757 from atsareg/fix-v6r9

[v6r9] AccountingDB - fix the problem of grouping by Country, Grid