diff --git a/API/hdx.py b/API/hdx.py
index b0bf2dd6..0f530a57 100644
--- a/API/hdx.py
+++ b/API/hdx.py
@@ -220,13 +220,16 @@ async def process_custom_requests(
                 "summary": "Full HDX Dataset default",
                 "description": "Full yaml conversion for dataset with iso3 example",
                 "value": {
-                    "iso3": "NPL",
+                    "iso3": "MLI",
+                    "hdx_upload": True,
+                    "meta": True,
                     "categories": [
                         {
                             "Buildings": {
                                 "hdx": {
                                     "tags": [
                                         "facilities-infrastructure",
+                                        "buildings",
                                         "geodata",
                                     ],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
@@ -245,13 +248,13 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['building'] IS NOT NULL",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
                             "Roads": {
                                 "hdx": {
-                                    "tags": ["transportation", "geodata"],
+                                    "tags": ["transportation", "roads", "geodata"],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
                                 },
                                 "types": ["lines"],
@@ -268,13 +271,13 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['highway'] IS NOT NULL",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
                             "Waterways": {
                                 "hdx": {
-                                    "tags": ["hydrology", "geodata"],
+                                    "tags": ["hydrology", "rivers", "geodata"],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
                                 },
                                 "types": ["lines", "polygons"],
@@ -292,7 +295,7 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['waterway'] IS NOT NULL OR tags['water'] IS NOT NULL OR tags['natural'] IN ('water','wetland','bay')",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
@@ -322,7 +325,7 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['amenity'] IS NOT NULL OR tags['man_made'] IS NOT NULL OR tags['shop'] IS NOT NULL OR tags['tourism'] IS NOT NULL",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
@@ -349,16 +352,13 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['aeroway'] IS NOT NULL OR tags['building'] = 'aerodrome' OR tags['emergency:helipad'] IS NOT NULL OR tags['emergency'] = 'landing_site'",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
                             "Sea Ports": {
                                 "hdx": {
-                                    "tags": [
-                                        "facilities-infrastructure",
-                                        "geodata",
-                                    ],
+                                    "tags": ["facilities-infrastructure", "geodata"],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
                                 },
                                 "types": ["points", "lines", "polygons"],
@@ -373,16 +373,13 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['amenity'] = 'ferry_terminal' OR tags['building'] = 'ferry_terminal' OR tags['port'] IS NOT NULL",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
                             "Education Facilities": {
                                 "hdx": {
-                                    "tags": [
-                                        "education facilities-schools",
-                                        "geodata",
-                                    ],
+                                    "tags": ["education facilities-schools", "geodata"],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
                                 },
                                 "types": ["points", "polygons"],
@@ -397,13 +394,13 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['amenity'] IN ('kindergarten', 'school', 'college', 'university') OR building IN ('kindergarten', 'school', 'college', 'university')",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
                             "Health Facilities": {
                                 "hdx": {
-                                    "tags": ["geodata"],
+                                    "tags": ["geodata", "health facilities", "health"],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
                                 },
                                 "types": ["points", "polygons"],
@@ -420,7 +417,7 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['healthcare'] IS NOT NULL OR tags['amenity'] IN ('doctors', 'dentist', 'clinic', 'hospital', 'pharmacy')",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
@@ -428,6 +425,7 @@ async def process_custom_requests(
                                 "hdx": {
                                     "tags": [
                                         "populated places-settlements",
+                                        "villages",
                                         "geodata",
                                     ],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
@@ -441,13 +439,18 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['place'] IN ('isolated_dwelling', 'town', 'village', 'hamlet', 'city')",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
                             "Financial Services": {
                                 "hdx": {
-                                    "tags": ["economics", "geodata"],
+                                    "tags": [
+                                        "economics",
+                                        "financial institutions",
+                                        "financial services",
+                                        "geodata",
+                                    ],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
                                 },
                                 "types": ["points", "polygons"],
@@ -461,7 +464,7 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['amenity'] IN ('mobile_money_agent','bureau_de_change','bank','microfinance','atm','sacco','money_transfer','post_office')",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                         {
@@ -487,7 +490,7 @@ async def process_custom_requests(
                                     "source",
                                 ],
                                 "where": "tags['railway'] IN ('rail','station')",
-                                "formats": ["geojson"],
+                                "formats": ["geojson", "shp", "kml"],
                             }
                         },
                     ],
@@ -528,7 +531,7 @@ async def process_custom_requests(
                         {
                             "Roads": {
                                 "hdx": {
-                                    "tags": ["transportation", "geodata"],
+                                    "tags": ["transportation", "roads", "geodata"],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
                                 },
                                 "types": ["lines"],
@@ -551,7 +554,7 @@ async def process_custom_requests(
                         {
                             "Waterways": {
                                 "hdx": {
-                                    "tags": ["hydrology", "geodata"],
+                                    "tags": ["hydrology", "rivers", "geodata"],
                                     "caveats": "OpenStreetMap data is crowd sourced and cannot be considered to be exhaustive",
                                 },
                                 "types": ["lines", "polygons"],