diff --git a/application/queries/locationReportQueries.py b/application/queries/locationReportQueries.py
index bf4401a..45a680b 100644
--- a/application/queries/locationReportQueries.py
+++ b/application/queries/locationReportQueries.py
@@ -10,7 +10,7 @@
 def getChemInLoc(loc_data):
     ##Returns all containers, chem in Storages and rooms and floors in build
     loc_cons = {"Building":"Buildings.bId == loc_data['Building']", "Floor":"Floors.fId == loc_data['Floor']", "Room":"Rooms.rId == loc_data['Room']", "Storage":"Storages.sId == loc_data['Storage']"}
-    haz_cons = {"reactive":"Chemicals.primaryHazard == 'Reactive'", "hh":"Chemicals.primaryHazard == 'Health Hazard'", "base":"Chemicals.primaryHazard == 'Base'", "oxi":"Chemicals.primaryHazard == 'Oxidizer'", "flam":"Chemicals.primaryHazard == 'Flammable'", "inorg_acid":"Chemicals.primaryHazard == 'Inorganic Acid'", "flam_solid":"Chemicals.primaryHazard == 'Flammable Solid'", "org_acid":"Chemicals.primaryHazard == 'Organic Acid'", "gen_haz":"Chemicals.primaryHazard == 'General Hazard'", "pres":"Chemicals.pressureFormer == True", "per":"Chemicals.peroxideFormer == True", "req_stab":"Chemicals.reqStabalizer == True", "tox_form":"Chemicals.toxicFormation == True", "p_list":"Chemicals.pListAcute == True"}
+    haz_cons = {"reactive":"Chemicals.primaryHazard == 'Reactive'", "org_haz":"Chemicals.primaryHazard == 'Organic Health Hazard'", "inorg_haz":"Chemicals.primaryHazard == 'Inorganic Health Hazard'", "hh":"Chemicals.primaryHazard == 'Health Hazard'", "base":"Chemicals.primaryHazard == 'Base'", "oxi":"Chemicals.primaryHazard == 'Oxidizer'", "flam":"Chemicals.primaryHazard == 'Flammable'", "inorg_acid":"Chemicals.primaryHazard == 'Inorganic Acid'", "flam_solid":"Chemicals.primaryHazard == 'Flammable Solid'", "org_acid":"Chemicals.primaryHazard == 'Organic Acid'", "gen_haz":"Chemicals.primaryHazard == 'General Hazard'", "pres":"Chemicals.pressureFormer == True", "per":"Chemicals.peroxideFormer == True", "req_stab":"Chemicals.reqStabalizer == True", "tox_form":"Chemicals.toxicFormation == True", "p_list":"Chemicals.pListAcute == True"}
     ##The ifs are to instanciate the where, not sure how else to do it
     if loc_data["Building"] != "*":
         wheres = eval(loc_cons["Building"])
diff --git a/config/chemicalConfig.yaml b/config/chemicalConfig.yaml
index cc6855d..3d9f124 100644
--- a/config/chemicalConfig.yaml
+++ b/config/chemicalConfig.yaml
@@ -178,6 +178,10 @@ addChemDropdowns:
           # color: "Copper"
         - "Health Hazard"
           # color: "Blue"
+        - "Organic Health Hazard"
+          # color: "Blue"
+        - "Inorganic Health Hazard"
+          # color: "Blue"
         - "Organic Acid"
           # color: "Lavender"
         - "Inorganic Acid"
diff --git a/config/config.yaml b/config/config.yaml
index 58d875a..cac438a 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -53,6 +53,14 @@ hazards:
     hazardColor: "Blue"
     textColor: "#FFFFFF"
     hexColor: "#0000FF"
+  "Organic Health Hazard":
+    hazardColor: "Blue"
+    textColor: "#FFFFFF"
+    hexColor: "#0000FF"
+  "Inorganic Health Hazard":
+    hazardColor: "Blue"
+    textColor: "#FFFFFF"
+    hexColor: "#0000FF"
   "Inorganic Acid":
     hazardColor: "Rose"
     textColor: "#333333"
diff --git a/config/reports.yaml b/config/reports.yaml
index d531d51..f060965 100644
--- a/config/reports.yaml
+++ b/config/reports.yaml
@@ -14,6 +14,12 @@ ReportTypes:
     health:
        name: "Health Hazard"
        id: "hh"
+    org_hazard:
+       name: "Organic Health Hazard"
+       id: "org_haz"
+    inorg_hazard:
+       name: "Inorganic Health Hazard"
+       id: "inorg_haz"
     org_acid:
        name: "Organic Acid"
        id: "org_acid"