diff --git a/core/serializers/detail.py b/core/serializers/detail.py
index 099eda60..0c6b446e 100644
--- a/core/serializers/detail.py
+++ b/core/serializers/detail.py
@@ -1,4 +1,5 @@
 import logging
+from collections import defaultdict
 from contextlib import suppress
 from typing import Collection, Any
 
diff --git a/evibes/settings/constance.py b/evibes/settings/constance.py
index bfd561a5..2395f758 100644
--- a/evibes/settings/constance.py
+++ b/evibes/settings/constance.py
@@ -50,7 +50,7 @@ CONSTANCE_CONFIG = OrderedDict(
     ]
 )
 
-CONSTANCE_CONFIG_FIELDSETS = {
+CONSTANCE_CONFIG_FIELDSETS = OrderedDict({
     gettext_noop("General Options"): (
         "PROJECT_NAME",
         "FRONTEND_DOMAIN",
@@ -86,7 +86,7 @@ CONSTANCE_CONFIG_FIELDSETS = {
         "ADVERTISEMENT_DATA",
         "ANALYTICS_DATA",
     ),
-}
+})
 
 EXPOSABLE_KEYS = [
     "PROJECT_NAME",