diff --git a/src/apps/ideology/models/completed_answer.py b/src/apps/ideology/models/completed_answer.py
index 21ea348..18e2ac3 100644
--- a/src/apps/ideology/models/completed_answer.py
+++ b/src/apps/ideology/models/completed_answer.py
@@ -69,14 +69,17 @@ def _map_axes(self) -> Dict[str, CalculationItem]:
             if not clean_uuid or clean_uuid not in hierarchy_map:
                 continue
 
+            margin_left = axis.get("margin_left")
+            margin_right = axis.get("margin_right")
+
             mapped_axes[clean_uuid] = format_mapped_item(
                 item_type="axis",
                 value=axis.get("value"),
                 complexity_uuid=hierarchy_map[clean_uuid]["complexity_uuid"],
                 is_indifferent=axis.get("is_indifferent", False),
                 section_uuid=hierarchy_map[clean_uuid]["section_uuid"],
-                margin_left=axis.get("margin_left", 0),
-                margin_right=axis.get("margin_right", 0),
+                margin_left=margin_left if margin_left is not None else 0,
+                margin_right=margin_right if margin_right is not None else 0,
             )
         return mapped_axes
 
diff --git a/src/backend/settings/base.py b/src/backend/settings/base.py
index 435621f..7e37504 100644
--- a/src/backend/settings/base.py
+++ b/src/backend/settings/base.py
@@ -131,7 +131,7 @@
         "PASSWORD": env("POSTGRES_PASSWORD", default=""),
         "HOST": env("POSTGRES_HOST", default="postgres"),
         "PORT": env("POSTGRES_PORT", default=""),
-        "CONN_MAX_AGE": env.int("CONN_MAX_AGE", default=1000),
+        "CONN_MAX_AGE": env.int("CONN_MAX_AGE", default=0),
         "DISABLE_SERVER_SIDE_CURSORS": True,
         "TEST": {
             "NAME": "testing_database",