diff --git a/pub/api/classes/API.php b/pub/api/classes/API.php
index 9f1757a..b145c53 100644
--- a/pub/api/classes/API.php
+++ b/pub/api/classes/API.php
@@ -688,7 +688,6 @@ class API
 
     protected function buildDynamicQuery(string $tableName): array
     {
-        $this->baseQuery = '';
         if (!$this->baseQuery) {
             $this->baseQuery = "SELECT * FROM " . $tableName;
         }
diff --git a/pub/api/classes/API_usergroups.php b/pub/api/classes/API_usergroups.php
index e405ca8..2a4e42c 100644
--- a/pub/api/classes/API_usergroups.php
+++ b/pub/api/classes/API_usergroups.php
@@ -25,6 +25,7 @@ class API_usergroups extends API
         if ($this->getUsergroup(true)) {
             $this->apiOutput(409, ['error' => 'Usergroup already exists.']);
         }
+        $this->baseQuery = ''; # reset the base query set $_GET['builder]
 
         $this->data['user_group_weight'] = $this->get_next_available_user_group_weight($this->data['user_group_weight']);
 
@@ -37,6 +38,7 @@ class API_usergroups extends API
         $timestamp = time();
         $stmt->bind_param("ssisi", $this->data['user_group_name'], $this->data['user_group_slugify'], $this->data['user_group_weight'], $this->data['user_group_type'], $timestamp);
         $this->executeStatement($stmt);
+        $_GET['builder'] = [1 => ['where' => [0 => 'user_group_slugify', 1 => $this->data['user_group_slugify']]]];
         $user_group = $this->getUsergroup();
         $user_group_uuid = $user_group[0]['user_group_uuid'];
 
diff --git a/pub/bin/php/Classes/serverOverviewBuilder.php b/pub/bin/php/Classes/serverOverviewBuilder.php
index 428d4c9..576bccc 100644
--- a/pub/bin/php/Classes/serverOverviewBuilder.php
+++ b/pub/bin/php/Classes/serverOverviewBuilder.php
@@ -424,7 +424,7 @@ class serverOverviewBuilder
                                             }
                                         }
                                         ?>
-                                    data-sort="<?php echo htmlspecialchars($sortValue); ?>" data-filter="<?php echo htmlspecialchars($filterValue); ?>">
+                                        data-sort="<?php echo htmlspecialchars($sortValue); ?>" data-filter="<?php echo htmlspecialchars($filterValue); ?>">
                                     <?php
                                     if (!empty($sortValue)) {
                                         if (count($sizes) === 1) {