diff --git a/src/module/Module_Common.bas b/src/module/Module_Common.bas
index 62f3fe3..d548ef5 100644
--- a/src/module/Module_Common.bas
+++ b/src/module/Module_Common.bas
@@ -178,24 +178,21 @@ Sub SortDataRows(Optional ByVal sortColumn As Long = 3)
         Header:=xlNo
 End Sub
 
-Sub ToggleAutoFilter(Optional ByVal filterRow As Long = 6)
-    Dim ws As Worksheet
-    Set ws = ActiveSheet
+Sub ToggleAutoFilter(ByVal startColumn As Long, ByVal endColumn As Long, Optional ByVal filterRow As Long = 6)
+    Dim ws As Worksheet: Set ws = ActiveSheet
     
     ' Check if auto filter is already on
     If ws.AutoFilterMode Then
         ws.AutoFilterMode = False
-    Else
-        If filterRow >= 1 Then
-            ws.Rows(filterRow).AutoFilter
-        End If
+        Exit Sub
     End If
+    If startColumn < 1 Or endColumn < startColumn Then Exit Sub
+    Dim filterRange As Range: Set filterRange = ws.Range(ws.Cells(filterRow, startColumn), ws.Cells(filterRow, endColumn))
+    filterRange.AutoFilter
 End Sub
 
-Sub AutoFitColumnWidth(Optional ByVal fitColumnStart As Long = 2, Optional ByVal fitColumnEnd As Long = 9)
-    Dim ws As Worksheet
-    Set ws = ActiveSheet
-    
+Sub AutoFitColumnWidth(ByVal fitColumnStart As Long, ByVal fitColumnEnd As Long)
+    Dim ws As Worksheet: Set ws = ActiveSheet
     If fitColumnStart <= fitColumnEnd Then
         ws.Range(ws.Columns(fitColumnStart), ws.Columns(fitColumnEnd)).AutoFit
     End If
diff --git a/src/thisWorkbook/Master_M1_Kukan.bas b/src/thisWorkbook/Master_M1_Kukan.bas
index 4831f45..8b945c9 100644
--- a/src/thisWorkbook/Master_M1_Kukan.bas
+++ b/src/thisWorkbook/Master_M1_Kukan.bas
@@ -330,7 +330,7 @@ Sub M1_SortDataRowsByC()
 End Sub
 
 Sub M1_ToggleAutoFilter()
-    Call ToggleAutoFilter(6)
+    Call ToggleAutoFilter(3, 14)
 End Sub
 
 Sub M1_AutoFitColumnWidth()
diff --git a/src/thisWorkbook/Master_O1_address.bas b/src/thisWorkbook/Master_O1_address.bas
index 4569a9e..5f30f99 100644
--- a/src/thisWorkbook/Master_O1_address.bas
+++ b/src/thisWorkbook/Master_O1_address.bas
@@ -43,7 +43,7 @@ Sub O1_SortDataRowsByC()
 End Sub
 
 Sub O1_ToggleAutoFilter()
-    Call ToggleAutoFilter(6)
+    Call ToggleAutoFilter(3, 5)
 End Sub
 
 Sub O1_AutoFitColumnWidth()
diff --git a/src/thisWorkbook/Master_O2_507.bas b/src/thisWorkbook/Master_O2_507.bas
index 9672668..bffb63b 100644
--- a/src/thisWorkbook/Master_O2_507.bas
+++ b/src/thisWorkbook/Master_O2_507.bas
@@ -8,7 +8,7 @@ Sub O2_SortDataRowsByC()
 End Sub
 
 Sub O2_ToggleAutoFilter()
-    Call ToggleAutoFilter(6)
+    Call ToggleAutoFilter(3, 15)
 End Sub
 
 Sub O2_AutoFitColumnWidth()
diff --git a/src/thisWorkbook/Master_Z1_222.bas b/src/thisWorkbook/Master_Z1_222.bas
index 15ac97a..50dea64 100644
--- a/src/thisWorkbook/Master_Z1_222.bas
+++ b/src/thisWorkbook/Master_Z1_222.bas
@@ -162,7 +162,7 @@ Sub Z1_SortDataRowsByC()
 End Sub
 
 Sub Z1_ToggleAutoFilter()
-    Call ToggleAutoFilter(6)
+    Call ToggleAutoFilter(2, END_COL)
 End Sub
 
 Sub Z1_AutoFitColumnWidth()
diff --git a/src/thisWorkbook/Master_Z2_223.bas b/src/thisWorkbook/Master_Z2_223.bas
index c58f314..d6e7dea 100644
--- a/src/thisWorkbook/Master_Z2_223.bas
+++ b/src/thisWorkbook/Master_Z2_223.bas
@@ -146,7 +146,7 @@ Sub Z2_SortDataRowsByC()
 End Sub
 
 Sub Z2_ToggleAutoFilter()
-    Call ToggleAutoFilter(6)
+    Call ToggleAutoFilter(2, END_COL)
 End Sub
 
 Sub Z2_AutoFitColumnWidth()
diff --git a/src/thisWorkbook/Master_Z3_224.bas b/src/thisWorkbook/Master_Z3_224.bas
index 8fc4847..ba261cb 100644
--- a/src/thisWorkbook/Master_Z3_224.bas
+++ b/src/thisWorkbook/Master_Z3_224.bas
@@ -154,7 +154,7 @@ Sub Z3_SortDataRowsByC()
 End Sub
 
 Sub Z3_ToggleAutoFilter()
-    Call ToggleAutoFilter(6)
+    Call ToggleAutoFilter(2, END_COL)
 End Sub
 
 Sub Z3_AutoFitColumnWidth()
diff --git a/通勤手当テンプレート_案.xlsm b/通勤手当テンプレート_案.xlsm
index 5d0ca6d..42c9948 100644
Binary files a/通勤手当テンプレート_案.xlsm and b/通勤手当テンプレート_案.xlsm differ