diff --git a/scripts/bigquery_cleaned_layer.py b/scripts/bigquery_cleaned_layer.py
index 26dbd9c..8754ad9 100644
--- a/scripts/bigquery_cleaned_layer.py
+++ b/scripts/bigquery_cleaned_layer.py
@@ -296,44 +296,21 @@ def assign_direction(indicator_name: str) -> str:
 # FRAMEWORK CLASSIFICATION (MDGs vs SDGs)
 # =============================================================================
 
-# Daftar keyword eksplisit dari SDG Goal 2 (2030 Agenda for Sustainable Development)
-# Sumber: UN SDG Indicators — versi Maret 2020
-# Indikator: 2.1.1, 2.1.2, 2.2.1, 2.2.2, 2.2.3, 2.3.1, 2.3.2, 2.4.1,
-#            2.5.1, 2.5.2, 2.a.1, 2.a.2, 2.b.1, 2.c.1
+# Daftar keyword eksplisit dari SDG Goal 2 Khusus FIES(2030 Agenda for Sustainable Development)
+
 SDG_INDICATOR_KEYWORDS = frozenset([
-    # 2.1.1 — Prevalence of undernourishment
-    "prevalence of undernourishment",
-    # 2.1.2 — Prevalence of moderate or severe food insecurity (FIES)
-    "prevalence of moderate or severe food insecurity",
-    "prevalence of severe food insecurity",
-    "prevalence of moderate food insecurity",
-    # 2.2.1 — Prevalence of stunting
-    "prevalence of stunting",
-    # 2.2.2 — Prevalence of malnutrition (wasting and overweight)
-    "prevalence of malnutrition",
-    "prevalence of wasting",
-    "prevalence of overweight",
-    # 2.2.3 — Prevalence of anaemia in women 15-49
-    "prevalence of anaemia",
-    "prevalence of anemia",
-    # 2.3.1 — Volume of production per labour unit
-    "volume of production per labour unit",
-    # 2.3.2 — Average income of small-scale food producers
-    "average income of small-scale food producers",
-    # 2.4.1 — Proportion of agricultural area under productive and sustainable agriculture
-    "proportion of agricultural area under productive",
-    # 2.5.1 — Number of plant and animal genetic resources secured
-    "number of plant and animal genetic resources",
-    # 2.5.2 — Proportion of local breeds at risk of extinction
-    "proportion of local breeds classified as being at risk",
-    # 2.a.1 — Agriculture orientation index for government expenditures
-    "agriculture orientation index",
-    # 2.a.2 — Total official flows to the agriculture sector
-    "total official flows",
-    # 2.b.1 — Agricultural export subsidies
-    "agricultural export subsidies",
-    # 2.c.1 — Indicator of food price anomalies
-    "indicator of food price anomalies",
+    "Prevalence of severe food insecurity in the total population (percent) (3-year average)",
+    "Prevalence of severe food insecurity in the male adult population (percent) (3-year average)",
+    "Prevalence of severe food insecurity in the female adult population (percent) (3-year average)",
+    "Prevalence of moderate or severe food insecurity in the total population (percent) (3-year average)",
+    "Prevalence of moderate or severe food insecurity in the male adult population (percent) (3-year average)",
+    "Prevalence of moderate or severe food insecurity in the female adult population (percent) (3-year average)",
+    "Number of severely food insecure people (million) (3-year average)",
+    "Number of severely food insecure male adults (million) (3-year average)",
+    "Number of severely food insecure female adults (million) (3-year average)",
+    "Number of moderately or severely food insecure people (million) (3-year average)",
+    "Number of moderately or severely food insecure male adults (million) (3-year average)",
+    "Number of moderately or severely food insecure female adults (million) (3-year average)"
 ])