diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
index 4fdc6abe..16e570be 100644
--- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
+++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
@@ -585,9 +585,9 @@
                           <span th:text="${crackdownStatus.napoSeaPointLon}"></span>
                           <div th:text="${crackdownStatus.napoSeaPointDetail}"></div>
                         </td>
-                        <th:block th:each="commonCode:${session.commonCode.get('IST')}">
-                          <td th:if="${crackdownStatus.invasionType ne null && crackdownStatus.invasionType eq commonCode.itemCd}" th:text="1"></td>
-                          <td th:if="${crackdownStatus.invasionType ne commonCode.itemCd}" th:text="0"></td>
+                        <th:block th:each="code:${session.commonCode.get('IST')}">
+                          <td th:if="${crackdownStatus.invasionType ne null && crackdownStatus.invasionType eq code.itemCd}">1</td>
+                          <td th:if="${crackdownStatus.invasionType ne code.itemCd}">0</td>
                         </th:block>
                         <td th:text="${crackdownStatus.nll eq 'Y' ? 1 : 0}"></td>
                         <td th:text="${crackdownStatus.obstrExspdCnt}"></td>
@@ -597,36 +597,30 @@
                         <td th:text="${crackdownStatus.materialDamageCnt}"></td>
                         <td th:text="${#numbers.formatInteger(crackdownStatus.materialDamageAmount, 3, 'COMMA')}"></td>
                         <td th:text="${crackdownStatus.materialDamageDetail}"></td>
-                        <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
-                          <td th:if="${crackdownStatus.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                        </th:block>
-                        <th:block th:if="${crackdownStatus.caseAgency eq null || crackdownStatus.caseAgency eq ''}">
-                          <td></td>
-                        </th:block>
-                        <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
-                          <td th:if="${crackdownStatus.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                        </th:block>
-                        <th:block th:if="${!#strings.contains(crackdownStatus.crackdownPolice, 'CPO')}">
-                          <td th:text="${crackdownStatus.crackdownPolice}"></td>
-                        </th:block>
-                        <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CPO')))}">
-                          <th:block th:if="${'CPO'+num == crackdownStatus.crackdownPolice}" th:each="commonCode:${session.commonCode.get('CPO'+num)}">
-                            <td th:if="${crackdownStatus.crackdownBoat eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                        <td>
+                          <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
+                            <th:block th:if="${crackdownStatus.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
                           </th:block>
-                        </th:block>
-                        <th:block th:if="${crackdownStatus.crackdownBoat eq null or !#strings.contains(crackdownStatus.crackdownBoat, 'CPO')}">
-                          <td></td>
-                        </th:block>
+                        </td>
+                        <td>
+                          <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
+                            <th:block th:if="${crackdownStatus.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                          </th:block>
+                        </td>
+                        <td>
+                          <th:block th:each="code:${session.commonCode.get(crackdownStatus.crackdownPolice)}">
+                            <th:block th:if="${crackdownStatus.crackdownBoat eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                          </th:block>
+                        </td>
                         <td th:text="${crackdownStatus.mmsi}"></td>
                         <td th:text="${crackdownStatus.fishingBoat.boatNameKr}"></td>
                         <td th:text="${crackdownStatus.fishingBoat.tonCnt}"></td>
                         <td th:text="${crackdownStatus.restrictionSailor + crackdownStatus.notRestrictionSailor}"></td>
-                        <th:block th:each="commonCode:${session.commonCode.get('BM')}">
-                          <td th:if="${crackdownStatus.fishingBoat.boatMaterial eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                        </th:block>
-                        <th:block th:if="${!#strings.contains(crackdownStatus.fishingBoat.boatMaterial, 'BM')}">
-                          <td th:text="${crackdownStatus.fishingBoat.boatMaterial}"></td>
-                        </th:block>
+                        <td>
+                          <th:block th:each="commonCode:${session.commonCode.get('BM')}">
+                            <th:block th:if="${crackdownStatus.fishingBoat.boatMaterial eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                          </th:block>
+                        </td>
                         <td th:text="${crackdownStatus.fishingBoat.boatNnySung}"></td>
                         <td th:text="${crackdownStatus.fishingBoat.boatNnySi}"></td>
                         <th:block th:each="sailor:${crackdownStatus.sailorList}">
@@ -637,12 +631,11 @@
                           <td></td>
                           <td></td>
                         </th:block>
-                        <th:block th:each="commonCode:${session.commonCode.get('FT')}">
-                          <td th:if="${crackdownStatus.fishingBoat.fisheryType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                        </th:block>
-                        <th:block th:if="${!#strings.contains(crackdownStatus.fishingBoat.fisheryType, 'FT')}">
-                          <td th:text="${crackdownStatus.fishingBoat.fisheryType}"></td>
-                        </th:block>
+                        <td>
+                          <th:block th:each="commonCode:${session.commonCode.get('FT')}">
+                            <th:block th:if="${crackdownStatus.fishingBoat.fisheryType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                          </th:block>
+                        </td>
                         <td th:text="${crackdownStatus.fishingBoat.catchFishSpecies}"></td>
                         <td th:text="${#numbers.formatInteger(crackdownStatus.fishingBoat.catchCnt, 3, 'COMMA')}"></td>
                         <td th:text="${crackdownStatus.fishingBoat.offenseFishSpecies}"></td>