Add field/column for Grouping tag
Fix dialog labels (text)