diff --git a/definitions/variable/macro-economy/gdp.yaml b/definitions/variable/macro-economy/gdp.yaml
index 528f898c..ffe7f8ec 100644
--- a/definitions/variable/macro-economy/gdp.yaml
+++ b/definitions/variable/macro-economy/gdp.yaml
@@ -9,17 +9,18 @@
 - Value Added|{Economic Sectors}:
     description: Value added by the {Economic Sectors}
     unit: billion USD_2010/yr
-    tier: {Economic Sectors}
-    navigate: Value Added|Commercial
+    tier: 1
+    navigate: Value Added|{Economic Sectors}
 - Capital Formation:
-    description: net additions to the physical capital stock
+    description: Net additions to the physical capital stock
     unit: billion USD_2010/yr
     tier: 1
 - Expenditure|Government:
-    description: total government expenditure
+    description: Total expenditure by governments
     unit: billion USD_2010/yr
     tier: 1
-- Expenditure|Household:
-    description: Total household expenditure
+- Expenditure|Households:
+    description: Total expenditure by households
     unit: billion USD_2010/yr
     tier: 1
+    navigate: Expenditure|Household
diff --git a/definitions/variable/macro-economy/labor-force.yaml b/definitions/variable/macro-economy/labor-force.yaml
new file mode 100644
index 00000000..8cc28291
--- /dev/null
+++ b/definitions/variable/macro-economy/labor-force.yaml
@@ -0,0 +1,14 @@
+- Labor Force|{Employment Status}:
+    description: Working-age inhabitants which are {Employment Status}
+      (part of the active labor force)
+    unit: million
+    tier: 1
+    min: 0
+    navigate: "{Employment Status}"
+- Labor Force|Inactive:
+    description: Inhabitants which are not part of the labor force, including
+      working-age people neither employed nor unemployed, and people not
+      in a working-age cohort (e.g., children, retirees)
+    unit: million
+    tier: 1
+    min: 0
diff --git a/definitions/variable/macro-economy/tag_econ_sectors.yaml b/definitions/variable/macro-economy/tag_economic_sectors.yaml
similarity index 85%
rename from definitions/variable/macro-economy/tag_econ_sectors.yaml
rename to definitions/variable/macro-economy/tag_economic_sectors.yaml
index 3e18f4b8..4565676c 100644
--- a/definitions/variable/macro-economy/tag_econ_sectors.yaml
+++ b/definitions/variable/macro-economy/tag_economic_sectors.yaml
@@ -1,10 +1,8 @@
 - Economic Sectors:
     - Agriculture:
         description: the aggregated agricultural sectors (ISIC Rev.4 A)
-        tier: 1
     - Industry:
         description: the aggregated industrial sector (ISIC Rev.4 B-F)
-        tier: 1
     - Services:
         description: the aggregated services sector (ISIC Rev.4 G-X)
-        tier: 1
+        navigate: Commercial
diff --git a/definitions/variable/macro-economy/tag_employment-status.yaml b/definitions/variable/macro-economy/tag_employment-status.yaml
new file mode 100644
index 00000000..62a63f11
--- /dev/null
+++ b/definitions/variable/macro-economy/tag_employment-status.yaml
@@ -0,0 +1,7 @@
+- Employment Status:
+    - Employed:
+        description: employed
+        navigate: Employment
+    - Unemployed:
+        description: unemployed
+        navigate: Unemployment
diff --git a/definitions/variable/population/population.yaml b/definitions/variable/population/population.yaml
index aba44857..bb810e1d 100644
--- a/definitions/variable/population/population.yaml
+++ b/definitions/variable/population/population.yaml
@@ -2,11 +2,6 @@
     definition: Total population
     unit: million
     tier: 1
-- Population|{Labor Force}:
-    definition: Inhabitants which are {Labor Force}
-    unit: million
-    tier: 1
-    min: 0
 - Population|Urban:
     definition: Total population living in urban areas
     unit: million
diff --git a/definitions/variable/population/tag_laborforce.yaml b/definitions/variable/population/tag_laborforce.yaml
deleted file mode 100644
index a95ae2f3..00000000
--- a/definitions/variable/population/tag_laborforce.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- Labor Force:
-    - Not Active:
-        definition: not at the age of working (not part of the active population / labor force)
-    - Employment:
-        definition: at the age of working (part of the active population / labor force) and employed
-    - Unemployment:
-        definition: at the age of working (part of the active population / labor force) and unemployed
diff --git a/tests/test_legacy.py b/tests/test_legacy.py
index eecb39cd..a4d8c6df 100644
--- a/tests/test_legacy.py
+++ b/tests/test_legacy.py
@@ -13,7 +13,7 @@ def test_legacy_variables():
         for project in LEGACY_PROJECTS:
             if project in attrs.extra_attributes:
                 legacy_var = attrs.__getattr__(project)
-                if legacy_var in existing_variables:
+                if legacy_var != code and legacy_var in existing_variables:
                     legacy_variables[legacy_var] = code
 
     if legacy_variables: