diff --git a/src/database/models/Filament.js b/src/database/models/Filament.js
index 3408f38..f767c77 100644
--- a/src/database/models/Filament.js
+++ b/src/database/models/Filament.js
@@ -48,6 +48,7 @@ export const Filament = {
   ],
   filters: ['_id', 'name', 'type', 'color', 'cost', 'vendor', 'vendor._id'],
   sorters: ['name', 'createdAt', 'type', 'vendor', 'cost', 'updatedAt'],
+  group: ['diameter', 'type', 'vendor'],
   properties: [
     {
       name: '_id',
diff --git a/src/database/models/GCodeFile.js b/src/database/models/GCodeFile.js
index fed59b4..df723c2 100644
--- a/src/database/models/GCodeFile.js
+++ b/src/database/models/GCodeFile.js
@@ -56,6 +56,7 @@ export const GCodeFile = {
   ],
   filters: ['_id', 'name', 'updatedAt'],
   sorters: ['name', 'createdAt', 'updatedAt'],
+  group: ['filament'],
   properties: [
     {
       name: '_id',
diff --git a/src/database/models/Printer.js b/src/database/models/Printer.js
index 2fd69bb..6c4d0e8 100644
--- a/src/database/models/Printer.js
+++ b/src/database/models/Printer.js
@@ -45,6 +45,7 @@ export const Printer = {
   columns: ['name', '_id', 'state', 'tags', 'connectedAt'],
   filters: ['name', '_id', 'state', 'tags'],
   sorters: ['name', 'state', 'connectedAt'],
+  group: ['tags'],
   properties: [
     {
       name: '_id',
@@ -82,12 +83,6 @@ export const Printer = {
       objectType: 'vendor',
       required: true
     },
-    {
-      name: 'moonraker.host',
-      label: 'Host',
-      type: 'text',
-      required: true
-    },
     {
       name: 'vendor._id',
       label: 'Vendor ID',
@@ -96,6 +91,12 @@ export const Printer = {
       showHyperlink: true,
       readOnly: true
     },
+    {
+      name: 'moonraker.host',
+      label: 'Host',
+      type: 'text',
+      required: true
+    },
     {
       name: 'moonraker.port',
       label: 'Port',
diff --git a/src/database/models/Vendor.js b/src/database/models/Vendor.js
index 915ceaf..cc9499e 100644
--- a/src/database/models/Vendor.js
+++ b/src/database/models/Vendor.js
@@ -47,6 +47,7 @@ export const Vendor = {
   columns: ['name', '_id', 'country', 'email', 'website', 'createdAt'],
   filters: ['name', '_id', 'country', 'email'],
   sorters: ['name', 'country', 'email', 'createdAt', '_id'],
+  group: ['country'],
   properties: [
     {
       name: '_id',