diff --git a/joj3_config_generator/models/task.py b/joj3_config_generator/models/task.py
index 6a876bc..7e790a3 100644
--- a/joj3_config_generator/models/task.py
+++ b/joj3_config_generator/models/task.py
@@ -18,7 +18,7 @@ class ParserResultDetail(BaseModel):
     mem: bool = True  # Display memory usage
     stdout: bool = False  # Display stdout messages
     stderr: bool = False  # Display stderr messages
-    exitstatus: bool = False
+    exit_status: bool = True
 
 
 class ParserFile(BaseModel):
diff --git a/joj3_config_generator/processers/repo.py b/joj3_config_generator/processers/repo.py
index 5b168fe..ed29d0e 100644
--- a/joj3_config_generator/processers/repo.py
+++ b/joj3_config_generator/processers/repo.py
@@ -46,15 +46,6 @@ def get_health_check_args(repo_conf: repo.Config) -> List[str]:
 
 
 def get_teapot_check_args(repo_conf: repo.Config) -> List[str]:
-    group_config = ""
-    for i, name in enumerate(repo_conf.groups.name):
-        group_config = (
-            group_config
-            + f"{name}="
-            + f"{repo_conf.groups.max_count[i]}:"
-            + f"{repo_conf.groups.time_period_hour[i]},"
-        )
-    group_config = group_config.removesuffix(",")
     return [
         "/usr/local/bin/joint-teapot",
         "joj3-check-env",
@@ -62,7 +53,14 @@ def get_teapot_check_args(repo_conf: repo.Config) -> List[str]:
         "--grading-repo-name",
         repo_conf.grading_repo_name,
         "--group-config",
-        group_config,
+        ",".join(
+            f"{name}={max_count}:{time_period}"
+            for name, max_count, time_period in zip(
+                repo_conf.groups.name,
+                repo_conf.groups.max_count,
+                repo_conf.groups.time_period_hour,
+            )
+        ),
     ]
 
 
diff --git a/joj3_config_generator/processers/task.py b/joj3_config_generator/processers/task.py
index b8ff8a0..0aa91eb 100644
--- a/joj3_config_generator/processers/task.py
+++ b/joj3_config_generator/processers/task.py
@@ -128,7 +128,7 @@ def fix_result_detail(
         score=0,
         comment="",
         show_files=show_files,
-        show_exit_status=result_detail_parser_config.exitstatus,
+        show_exit_status=result_detail_parser_config.exit_status,
         show_runtime=result_detail_parser_config.time,
         show_memory=result_detail_parser_config.mem,
     )